merged
authorJeremy Fitzhardinge <jeremy@xensource.com>
Thu, 24 May 2007 12:32:03 +0000 (13:32 +0100)
committerJeremy Fitzhardinge <jeremy@xensource.com>
Thu, 24 May 2007 12:32:03 +0000 (13:32 +0100)

Trivial merge